.\" Process this file with 
.\" groff -man -Tascii cvsxxdiff.1
.TH cvsxxdiff 1 "April 2008"
.SH NAME
cvsxxdiff \- Display file differences with the current or previous CVS
versions
.SH SYNOPSIS
.B cvsxxdiff
.RI [FILES|DIRECTORIES] 
.br
.B cvsxxdiff 
.RI "-c [FILES]"
.br
.B cvsxxdiff
.RI "<revision> FILE ..."
.br
.B cvsxxdiff 
.RI "<revision1> <revision2> FILE ..."
.SH DESCRIPTION
.B cvsxxdiff 
displays differences between files in the local working directory and the CVS
repository or between two revisions on the repository. The changelog
corresponding to these revisions is generated and printed. When invoked in
conflict resolve mode, it works as a graphical tool to resolve conflicts. 

By default
.B cvsxxdiff 
displays differences of all unupdated or modified files. If files
or directories are given in the argument list, only these are scanned. 

When no revision arguments are given, the latest version in CVS and the local
version are considered. If one CVS revision argument is given, it is compared
to the local version. If two CVS revisions are given, the comparison is
performed among them.
.SH OPTIONS
.TP
.BI \-b " NUMBER"
.I NUMBER 
of previous CVS revisions, relative to the local version, to compare
with
.TP
.BI \-r " REVISION"
.I REVISION 
in CVS to compare with
.TP
.BI \-D " DATE"
.I DATE 
in CVS to compare with.
.I DATE
should be in a format understood by CVS.
.TP
.BI \-c "" "\fR,\fP \-\-conflict\-resolve"
resolve conflicts in merged files
.TP
.BI \-x " XXDIFF_ARGS" "\fR,\fP \-\-xxdiff-args=" XXDIFF_ARGS
invoke xxdiff with 
.I XXDIFF_ARGS
as additional arguments
.TP
.BI \-\-stdin
read FILES or DIRECTORIES from stdin
.TP
.BI "\-h, \-\-help"
output help message and exit
.TP
.BI \-\-version 
output version information and exit
.SH EXAMPLES
.TP
cvsxxdiff \-b 1 filename.c
View differences of filename.c with the previous version in CVS
.TP
cvsxxdiff \-b 0 \-b 1 filename.c
View differences for filename.c between the latest and the previous versions in
CVS
.TP
cvsxxdiff \-r 1.2 \-r 1.1 filename.c
View differences for filename.c between version 1.2 and 1.1
.TP
cvsxxdiff \-r 1.2 \-r 1.1 filename1.c \-r 1.4 \-r 1.3 filename2.c
View differences among specific revisions for filename1.c and filename2.c
.SH SEE ALSO
.BR cvnup (1),
.BR cvscommit (1),
.BR cvs (1),
.BR xxdiff (1)
.SH AUTHOR
Michalis Giannakidis <mgiannakidis at gmail dot com>
